Merge branch 'sb/submodule-helper-clone-regression-fix'