Final version

Merge branch 'dev' into 'main'

Dev

See merge request isc/2021-22/niveau-2/2282-1-projet-p2-il-sp/g2!1