Merge branch 'sb/submodule-blanket-recursive'