Update codebase to latest changes in nomlib dev branch