Issue #2496