Issue #2508