Merge branch 'DirHandle-cleanup'