Merge "Migrate from Plugin SearchTarget to API search Target [2/3]"