Merge pull request #15657 from demeritcowboy/pledge-search-backport