Merge "Avoid test flaky" into main