Merge 3.8-rc4 into char-misc-next