0_6_35 Sync to core team's development branch

* Add "drop" action.
* Fix issue with statistics where statistics for non existent devices
could be printed.