Merge branch 'ps/submodule-sanitize-path-upon-add'