Merge branch 'hotfix/bug_etat_transition'