Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes