So considering the relatively large diffstat and the fact that we are 3 days after the closing of the merge window, I think we should separate this into minimal fixes for perf/urgent, and more involved changes for v4.5.