Version 2.25.3
Merge branch 'release/v2.25.3' into develop