Merge branch 'mg/maint-submodule-normalize-path' into maint