Pre-DHT temporary changes.
Merge branch 'dht'