Merge branch 'pw/p4-symlinked-root'