Issue #2495