Compiler: fix gen missing primitives
Merge tag '2.1'