Merge branch 'lt/dir-cleanup'