Merge branch 'ls/p4-path-encoding'