Merge branch 'jn/submodule-basic-test'