Merge branches 'upstream' and 'dev/dht' into dev/3.0.8