Issue #2582