Merge 5.7-rc5 into char-misc-next