Fix MAGN-2317
Merge branch 'master' into magn-2317
Merge pull request #1960 from Randy-Ma/magn-2317

Fix MAGN-2317