Merge branch 'bw/submodule-with-bs-path'