Merge branch 'develop' into release
Add CHANGELOG
Merge branch 'release'