Issue #2591