Bump version
Merge branch 'release/v1.0.25' into develop