Issue #2548