Issue #7800