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

All 8 tests pass in 1m 10s

1 files - 15 8 suites - 242 1m 10s ⏱️ - 49m 16s
8 tests - 290 8 ✅ - 278 0 💤 - 3 0 ❌ - 9
8 runs - 593 8 ✅ - 570 0 💤 - 8 0 ❌ - 15

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