Fix: codegen.cpp does not compile
Merge branch 'master' into master_cleanup