Issue #2781