[DHT-1033]

[DHT-1033]