Merge 4.8-rc5 into char-misc-next