Merge models on development

Line is too long. [82/80]