Merge models on development

Line is too long. [88/80]