Issue #2680