work in progress
Merge branch 'develop' into feature/mo_properties
Passing duration and other properties to MO
Merge branch 'feature/mo_properties' into develop