Fix model type fields

Andrey Veltischev requested to merge andrey/model_type_fix into master

Merge request reports