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