Issue #2630