Merge branch 'wk/submodule-on-branch'