Issue #2682