Merge "Bug fix for delete data node not working for root node"