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