Merge branch 'ld/p4-exclude-in-sync'