Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1