Created HSEARCH-1577