Merge branch 'sb/fix-fetching-moved-submodules'