Merge 3.9-rc7 into char-misc-next