Merge "Fix code generation"