Merge branch 'nd/fix-directory-attrs-off-by-one' into maint