Fix transition
Bump version
Merge branch 'release/v1.0.21' into develop