MIFOSX-1377,MIFOSX-1235
Merge pull request #993 from lingalamadhukar/MIFOSX-1235

MIFOSX-1377,MIFOSX-1235