Issue #2502