Issue #5398