Issue #2612