Merge branch 'jk/path-name-safety-2.7' into maint