Merge branch 'sb/submodule-parallel-update' into maint