MIFOSX-1064,MIFOSX-1058,MIFOSX-1042,MIFOSX-1027
Merge pull request #876 from lingalamadhukar/bug_fixes

MIFOSX-1064,MIFOSX-1058,MIFOSX-1042,MIFOSX-1027