speed up the remove_disconnected_node() method
Merge branch 'datapath' into dev