Merge tag 'v6.4' into next