Antalya 26.4: auto-grp-pr-1694: combined port of 2 PRs#1878

Open

zvonand wants to merge 3 commits into

antalya-26.4from

feature/antalya-26.4/auto-grp-pr-1694

Commits on Jun 7, 2026

Cherry-pick of https://github.com/Altinity/ClickHouse/pull/1694 with unresolved conflict markers (resolution in next commit)
zvonand
committed
Resolve conflicts in cherry-pick of #1694
zvonand
committed
Merge pull request #1723 from Altinity/frontport/antalya-26.3/hybrid-move-watermark
zvonand
committed