Issue #2690