Merge 4.3-rc5 into char-misc next