Merge branch 'issue-4292' into release
Update changelog
Merge branch 'release' into upstream