[DHT-689] DHT-689