Merge 4.3-rc3 into char-misc-next