Issue #2537