MIFOSX-1260,MIFOSX-1311

MIFOSX-1260,MIFOSX-1287
Merge pull request #933 from lingalamadhukar/MIFOSX-1267

MIFOSX-1260,MIFOSX-1287,MIFOSX-1311