Merge "Avoid sleep in test." into main