MIFOSX-1351,MIFOSX-1349
Merge pull request #963 from lingalamadhukar/MIFOSX-1349

MIFOSX-1351,MIFOSX-1349