2526: add retry for yt fails
Merge branch 'staging' into i-2564
Merge branch 'i-2564' into staging