Issue #6304