Merge branch 'release/5.25.0'