Fix for MAGN-687, MAGN-701, MAGN-728