Merge branch 'hv/submodule-update-none'