Issue #2585