[DHT-1038]

[DHT-1038]