Update changelog for release
Changelog placeholder
Merge branch 'release' into upstream