Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes