Merge tag 'v6.6-rc2' into locking/core, to pick up fixes