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

All 1 tests pass in 34s

1 files - 15 5 suites - 245 34s ⏱️ - 49m 52s
1 tests - 297 1 ✅ - 285 0 💤 - 3 0 ❌ - 9
1 runs - 600 1 ✅ - 577 0 💤 - 8 0 ❌ - 15

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