Issue #2704