Merge models on development

Line is too long. [96/80]