Merge branch 'sb/submodule-recursive-absorb'