HSEARCH-1556

Based on HSEARCH-1560