HSEARCH-1119

BASED on HSEARCH-704 and pr #621