Merge branch 'sb/submodule-path-misc-bugs' into maint