8.0 fix states

Merged Sebastian Kennedy requested to merge 8.0-FIX-states into 8.0-stage

Merge request reports