Merge 3.5-rc4 into tty-next