Merge 4.0-rc3 into tty-testing