Improve automatic conversion of models.
Merge remote-tracking branch 'origin/master' into AH-286_Check_With_Server_If_Checkpoint_Reached
AH-286 Done as far as i can see. Maybe some testing or stuff later.