Merge branch 'sb/submodule-config-cleanup'