Merge branch 'nd/dir-exclude-cleanup' into maint