Manual sync needed: main → v4 merge conflict

The automated `main` → `v4` sync hit merge conflicts.

Triggered by: 7b553549161a7722c37fb53b6c21bf8766b52c3c

Please resolve manually:
```sh
git fetch origin main v4
git checkout v4
git merge origin/main
# resolve conflicts
git push origin v4
```