Update CHANGELOG
Merge branch 'feature/update-changelog' into develop