Merge branch 'mh/ref-remove-empty-directory'