Merge 5.4-rc7 into char-misc-next