8.0 fix state name change

Merged Eric Horvat requested to merge 8.0-FIX-state-name-change into 8.0-stage

Merge request reports