Merge "Remove UNIMgr from N b/c of compilation failures"