release v2.5.0
Merge branch 'release/v2.5.0' into develop