Merge pull request #16575 from colemanw/savedSearch