Merge tag 'v4.6-rc3' into perf/core, to refresh the tree