Merge tag 'v6.5-rc6' into icc-next