Merge branch 'hv/submodule-config'