Bumped version to 25.0
Merge branch 'release-v25.0' into develop