Merge "Wait for all results to come before return." into main