Adapted to Magnum changes.
Merge branch 'master' into school
Adapted to Magnum changes.