Merge "Fix assignment for last element in codegen list" into main