Fixes of states

Vadym Tishchenko requested to merge vadym/new_fixes into master

Merge request reports