Merge branch 'jc/subdir'