Merge branch 'ld/p4-filetype-detection'