Merge branch 'jc/directory-attrs-regression-fix'