Issue #2626