Keep dev branch aligned with main

### Description
After merges into `main`, the `dev` branch must be kept aligned to avoid drift.

### Acceptance criteria
- [ ] `dev` contains all commits from `main`
- [ ] No force-push on `dev`
- [ ] Alignment done via `git merge main` into `dev`