Merge "Fix flaky test" into main