Merge 5.5-rc6 into char-misc-next