[DHT-0683]

[DHT-0683]