gh-436: yt retry updates
Merge branch 'gh-436' into production