Merge remote-tracking branch 'upstream/issue-3260' into release
Merge branch 'release' into upstream