Done random dropping.
Merge remote-tracking branch 'origin/master' into dev/interaction