Merge tag 'v5.8-rc6' into locking/core, to pick up fixes