Merge branch 'master' into group_models

8 jobs for group_models in 127 minutes and 47 seconds (queued for 3 seconds)