Fix MAGN-2317
Merge branch 'master' into magn-2317