FIXED MIFSOX-1237,MIFOSX-1238
Merge pull request #922 from lingalamadhukar/MIFOSX-1237

FIXED MIFSOX-1237,MIFOSX-1238