Merge branch 'ja/directory-attrs' into maint