HSEARCH-1488 for master