Merge "Fix performance build output being lost"