Merge commit 'v3.0-rc3' into perf/core