Code

Merge branch 'jk/no-no-no-empty-directory'