Merge pull request #14891 from eileenmcnaughton/saved_search