merge changes from master:

Stop auto generating convergence models while creating model groups.