Issue #2561