Update changelog_release.xml
Version code in changelog
Merge branch 'release' into upstream