Merge tag 'v4.6-rc6' into locking/core, to pick up fixes