HSEARCH-1488 for branch 4.5