Merge "Merge "Fix assignment for last element in codegen list" into main am: 12e1764dd6 am: 7f966b51e2" into main