For easier review, I've split the model update into two separate MRs. This one contains just the generated code.
merged