Issue #2625