Exactly the same as !267 (merged) but for the feature/scientific_model_updates branch
feature/scientific_model_updates