Issue #2614