Issue #2540