Issue #2554