Dmitriy/Fix serialization

Andrey Veltischev requested to merge dmitriy/fix_serialization into master

Merge request reports