Issue #2505