Issue #2447