Issue #2610