Update changelog_release.xml
Merge branch 'issue-4246' into release
Merge branch 'release' into upstream