Merge branch 'sb/submodule-merge-in-merge-recursive'