Issue #5974