Merge tag 'v3.13' into for-3.15