Merge branch 'issue-4260' into release
Merge branch 'release' into upstream