Merge branch 'aj/p4-symlink-lose-nl'