MIFOSX-1235,MIFOSX-1365,MIFSOX-1204
Merge pull request #974 from lingalamadhukar/MIFOSX-1235

MIFOSX-1235,MIFOSX-1365,MIFSOX-1204