Merge branch 'sb/submodule-helper-relative-path'