Merge 5.3-rc4 into char-misc-next