Merge branch 'rj/path-cleanup'