[DHT-0317]

[DHT-0317]