Issue #5365