Update for magnus

Change-Id: I7d8a7d4181efaa140db2c91ca4a8bb2249682f95