generated model type
Merge branch 'feature-model-type' into develop