Force optimization with definitions fields on model builder
Merge branch '1.1'