MAGN_830
Merge remote-tracking branch 'upstream/StableBranchWithTestcases' into LocalStable
Merge pull request #126 from ambarish-prakash/LocalStable

MAGN Issue 830 Fix