Issue #2597