Merge 3.8-rc5 into tty-next