Merge branch 'sb/submodule-move-nested'