some fixes for delete_node
Merge remote-tracking branch 'origin/master'