Dmitriy/Fix class field overwriting

Andrey Veltischev requested to merge dmitriy/fix_field_overwriting into master

Merge request reports