Fix #8219
Merge branch 'master' into fix-issue-8219
Merge branch 'fix-issue-8219'