Merge branch 'rs/path-name-safety-cleanup' into maint