Issue #5624