WIP: 7.0 fix sequence and states

Closed Reviewer Intergaláctico requested to merge 7.0-FIX_sequence_and_states into 7.0-stage

Work In Progress for the Tickets received from Gonzalo Gauna.

Merge request reports