Merge branch 'perf-upstream'