[MOD] Fix states

Merged Jose Luis Zanotti requested to merge DPI520 into 12.0-stage

Merge request reports