Issue #2624