Issue #2562