Mise en place des contraintes
Merge remote-tracking branch 'origin/DevEric' into devTom