Merge 4.5-rc2 into tty-next