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