Fixd MAGN-3313
Merged