[DHT-1028]

[DHT-1028]