Add node_name field to nodes record
Merge remote-tracking branch 'rt/master'