Merge branch 'sb/submodule-clone-retry'