Fix MAGN-5374
Merge pull request #3022 from Randy-Ma/magn-5374

Fix MAGN-5374