[SEARCH-HIGHLIGHT] - merge dev branch