Issue #2620