Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11