Issue #2635