Merge branch 'wp/add-patch-find'