Bundle update.
Merge branch 'release/v25'