Merge tmp.perf/core branch