RE: 4221 on new codegen