Issue #2452