Issue #2695