MIFOSX-1398,MIFOSX-1403
Merge pull request #1003 from lingalamadhukar/MIFOSX-1403

MIFOSX-1398,MIFOSX-1403