Merge branch 'issue-4529' into release
Update ChangeLog for release
Merge branch 'release' into upstream