Merge branch 'ms/submodule-foreach-fix' into maint