Issue #2573