Fix objective manager
Merge branch 'feature-mres' into develop