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

All 107 tests pass in 25s

1 files - 15 24 suites - 226 25s ⏱️ - 50m 1s
107 tests - 191 107 ✅ - 179 0 💤 - 3 0 ❌ - 9
113 runs - 488 113 ✅ - 465 0 💤 - 8 0 ❌ - 15

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