Merge 6.3-rc6 into char-misc-next