[FIX][RV-559] state order

Merged Uriel Mayo requested to merge smallFix into 12.0-stage

Merge request reports