Merge 4.2-rc4 into tty-next