Merge models on development

Line is too long. [86/80]