Issue #2696