Merge tag 'v3.13-rc4' into core/locking