Andrey/model fixes

Andrey Veltischev requested to merge andrey/model_fixes into master

Merge request reports