Merge branch 'ld/p4-compare-dir-vs-symlink' into maint