Issue #2700