Merge branch 'jn/submodule-b-current'