Merge "Fix multiple performance regressions" into main