Issue #2547