[MOD] Modifications in the states

Merged Matias requested to merge MOD into 12.0-stage

Merge request reports