Update code base for recent NUI merge