fixed exception global name 'attrs' is not defined
Merge remote-tracking branch 'origin/feature/fields_refactor' into feature/amnesty

* origin/feature/fields_refactor:
  fixed exception global name 'attrs' is not defined