Fix some models

4 jobs for !3461 with fix_models_2 in 14 minutes and 43 seconds (queued for 1 second)
merge request