Issue #2705