Merge branch 'tools-ynl-fix-impossible-errors'