Merge branch 'issue-4535' into release
Update Changelog
Merge branch 'release' into upstream