Issue #7944