Issue #2450