Version bump
Update CHANGELOG
Merge branch 'release/2.5.2' into develop