Version 2.25.2
Merge branch 'release/v2.25.2' into develop