Merge tag 'v3.13' into next