MIFOSX-1328,MIFOSX-1327,MIFOSX-1314,MIFOSX-1199
Merge pull request #960 from lingalamadhukar/m_issues

MIFOSX-1328,MIFOSX-1327,MIFOSX-1314,MIFOSX-1199