Merge 3.4-rc4 into tty-next