[FIX][T3774] Picking state to done

Merged Hermes requested to merge T3774 into 12.0

Merge request reports