Issue #2569