Merge v6.4-rc4 into char-misc-next