Issue #2504