Issue #2579