1.25.0
Merge branch 'release/1.25.0'