Merge tag 'v5.2-rc3' into locking/core, to pick up fixes