Merge tag 'v6.5' into next