Issue #2551