Merge tag 'v4.0-rc1' into perf/core, to refresh the tree