Merge 6.5-rc4 into char-misc-next