Issue #8798