Issue #2590