Merge v3.9-rc5 into char-misc-next