Fix MAGN-5489
One more fix
Minor adjustment
A few more changes
Changes to a few more places
Merge pull request #3253 from Randy-Ma/magn-5489

Fix MAGN-5489