Merge "Remove flaky test" into main