Sync up with magnum master

Sync up with magnum master