[DHT-0612]

[DHT-0612]