Merge 6.4-rc5 into char-misc-next