[2026-06-01] sync: merge conflicts present — manual review needed

This commit is contained in:
Alexey Martemyanov
2026-06-01 17:00:41 +06:00
28 changed files with 696 additions and 228 deletions