Merge branch 'rs/submodule-config-code-cleanup'