Merge v3.7-rc5 into tty-next