[UPDATE] Bump to 2.5.0
[CS] Cleanup changelog
Merge branch 'release/2.5.0' into develop