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

Update the models

See merge request !180
7 jobs for develop in 29 minutes and 40 seconds (queued for 2 seconds)