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