squash - form (Tentative fix TBD)

TODO:
- describe the BC break change,
- squash