[DHT-1142]

[DHT-1142]