[ADD] New states for editing managing

Merged Eric Horvat requested to merge 8.0-FIX-states-new-cycle into 8.0-stage

Fix #7

Merge request reports