Updates in ui/node merged into ui/unified