Merge branch 'update-the-models' into 'develop'

Update the models

See merge request !179
7 jobs for develop in 40 minutes and 6 seconds (queued for 13 minutes and 18 seconds)