Issue #2535