[FIX][T6837] move pop state

Merged diego.barreto requested to merge T6837 into 12.0

Merge request reports