Merge branch 'dht' into dev