Merge branch 'cl/p4-use-diff-tree'