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