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

All 3 tests pass in 50s

1 files - 15 4 suites - 246 50s ⏱️ - 49m 36s
3 tests - 295 3 ✅ - 283 0 💤 - 3 0 ❌ - 9
3 runs - 598 3 ✅ - 575 0 💤 - 8 0 ❌ - 15

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