Fixed: MAGN-352, MAGN-455