Merge "CodeGenerator update."