Issue #2507