Dmitriy/state refactoring

Andrey Veltischev requested to merge dmitriy/state_refactoring into master

Merge request reports