Merge "Add timer to wait for the Health update result." into main