Fix concurrent issue
Merge branch 'master' into Issue2541
Merge branch 'master' into Issue2541
[2541] Fix concurrent issue in displaying search results