HSEARCH-1311 Creating a dedicated distribution module