Release 0.8.25a
Merge branch 'release-0.8.25a' into development