Merge 6.8-rc3 into char-misc-next