Merge "Avoid Object.wait(0)" into main