Issue #2575