Issue #2550