Merge 5.6-rc7 into tty-next