Merge branch 'release/3.2.1' into develop
Bump `when` dep to `~3`
v3.2.2
Merge branch 'release/3.2.2'