Prep for release
Merge branch 'release/0.25' into develop