Merge "Add ability to override node attributes"