Fix model.setAloud
Merge