Merge "Add node UUI display macro"