[DHT-1056]

[DHT-1056]