Merge pull request #13121 from pradpnayak/BatchSearchFix