Issue #2555