Merge models on development

Line is too long. [92/80]