Merge 5.2-rc3 into tty-next