Issue #2587