Merge tag 'v5.12-rc5' into locking/core, to pick up fixes