Merge branch 'release_1.25.0'