Fix some models

4 jobs for !3592 with fix_models in 16 minutes and 50 seconds (queued for 1 second)
merge request