Issue #2607