Issue #2549