Merge branch 'mh/ref-directory-file' into maint