Fix deplyoment error
Merge branch 'dev' into feature/condition_edition