Merge branch 'ld/p4-case-fold'