Issue #2572