11.0 use custom states

Merged Julián Corso requested to merge 11.0-use_custom_states into 11.0-stage

Merge request reports