Merge "Avoid waiting for threads to create"