Additional code generation modifications
Merge branch 'code_gen'

* code_gen:
  Additional code generation modifications