Issue #2460