Merge 4.6-rc7 into char-misc-testing