MIFOSX-1235,MIFOSX-1302
Merge pull request #974 from lingalamadhukar/MIFOSX-1235

MIFOSX-1235,MIFOSX-1302