Issue #2519