Merge branch 'cf/submodule-progress-dissociate'