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

Take the fix for MAGN-5489 to the master branch