Added checking the field is of root_node
Merge remote-tracking branch 'origin/debug'