Merge branch 'dev' into update-toggle-and-model-selection