Merge the perf branch with the last update