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