Update codebase to latest changes in nomlib dev branch

(See also: nomlib commit #9ab6ae6585a0649acedb8897343845235b462cfa)