Merge branch 'nd/dir-prep-exclude-cleanup'