[DHT-1328]

[DHT-1328]