Issue #2697