Merge branch 'jk/submodule-subdirectory-ok'