Issue #2701