Merge branch 'release/4.0.2' into develop
Bump `when` dep to `~3`
v4.0.3
Merge branch 'release/4.0.3'