chore: cherry pick #3368 fix: added polling logic to ensure the retri… #7711

All 23 tests pass in 4m 39s

1 files - 15 10 suites - 240 4m 39s ⏱️ - 45m 47s
23 tests - 275 23 ✅ - 263 0 💤 - 3 0 ❌ - 9
23 runs - 578 23 ✅ - 555 0 💤 - 8 0 ❌ - 15

Results for commit e80299b. ± Comparison against earlier commit 593a47f.