Issue #2565