Merge upstream repo to add support for search and complex input.