Merge "[cnp] fixed S1-2415 issue("search" is not working)"