Merge branch 'sb/submodule-cleanup'