Issue #2689