Issue #20715: More fixes towards a clean save. Added defaults to the model.