Fix the remaining issues for MAGN-3785
Merge pull request #1855 from Randy-Ma/master

Fix the remaining issues for MAGN-3785