Merge 4.5-rc6 into char-misc-next